Autogenerated HTML docs for v1.6.2.1-147-g642d0
diff --git a/git-merge.html b/git-merge.html index 37d6fd8..85d772b 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -816,7 +816,7 @@ And here is another line that is cleanly resolved or unmodified.</tt></pre> </div></div> <div class="para"><p>The area where a pair of conflicting changes happened is marked with markers -"<tt><<<<<<<</tt>", "<tt>=======</tt>", and "<tt>>>>>>>></tt>". The part before the "<tt>=======</tt>" +<tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt>. The part before the <tt>=======</tt> is typically your side, and the part afterwards is typically their side.</p></div> <div class="para"><p>The default format does not show what the original said in the conflicting area. You cannot tell how many lines are deleted and replaced with @@ -840,8 +840,8 @@ >>>>>>> theirs:sample.txt And here is another line that is cleanly resolved or unmodified.</tt></pre> </div></div> -<div class="para"><p>In addition to the "<tt><<<<<<<</tt>", "<tt>=======</tt>", and "<tt>>>>>>>></tt>" markers, it uses -another "<tt>|||||||</tt>" marker that is followed by the original text. You can +<div class="para"><p>In addition to the <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> markers, it uses +another <tt>|||||||</tt> marker that is followed by the original text. You can tell that the original just stated a fact, and your side simply gave in to that statement and gave up, while the other side tried to have a more positive attitude. You can sometimes come up with a better resolution by @@ -920,7 +920,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-02-14 08:18:25 UTC +Last updated 2009-03-18 01:54:21 UTC </div> </div> </body>
